Autogenerated HTML docs for v2.12.0-rc1-28-gd09b6
diff --git a/git-difftool.txt b/git-difftool.txt index 224fb30..96c26e6 100644 --- a/git-difftool.txt +++ b/git-difftool.txt
@@ -86,10 +86,11 @@ Additionally, `$BASE` is set in the environment. -g:: ---gui:: +--[no-]gui:: When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured - `diff.guitool` variable instead of `diff.tool`. + `diff.guitool` variable instead of `diff.tool`. The `--no-gui` + option can be used to override this setting. --[no-]trust-exit-code:: 'git-difftool' invokes a diff tool individually on each file.
